Added check for existence of automake-1.10. Fixes bug #474507.

2007-09-11  Kevin Cozens  <kcozens@cvs.gnome.org>

	* autogen.sh: Added check for existence of automake-1.10.
	Fixes bug #474507.

svn path=/trunk/; revision=239

diff --git a/ChangeLog b/ChangeLog
index b86c9f917c30025d15b0acb6efe7a1fd0ec39447..52041dc2ac976595b1aa38e4c4ccefd59e15794c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-11  Kevin Cozens  <kcozens@cvs.gnome.org>
+
+       * autogen.sh: Added check for existence of automake-1.10.
+       Fixes bug #474507.
+
 2007-09-10  Øyvind Kolås  <pippin@gimp.org>
 
        * babl/babl-internal.c: (babl_process): return immediately if 0 pixels

diff --git a/autogen.sh b/autogen.sh
index fcb32dabb415d99790e0fdbcc7960ce687bed198..3765eaf3cb1991fdb3266d2881470071c6f36e9f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -129,6 +129,9 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=$AUTOMAKE
    ACLOCAL=$ACLOCAL
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-1.10
+   ACLOCAL=aclocal-1.10
 elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.9
    ACLOCAL=aclocal-1.9